assistant: Fix reversion that caused files to be added locked by default.

92c4a3441426e359dc8028175a22a54dae0c09be added a new config, but used an
existing config, which defaults to true. Oops!

diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs
index 53663e8b5b02e152c5ec50ff82f4f5b5cc08871d..7e41ca8e011d63ef5ad7d3881a5d0a992bb2223a 100644 (file)
--- a/Assistant/Threads/Committer.hs
+++ b/Assistant/Threads/Committer.hs
@@ -63,7 +63,7 @@ commitThread = namedThread "Committer" $ do
        largefilematcher <- liftAnnex largeFilesMatcher
        annexdotfiles <- liftAnnex $ getGitConfigVal annexDotFiles
        addunlockedmatcher <- liftAnnex $
-               ifM (annexSupportUnlocked <$> Annex.getGitConfig)
+               ifM (annexAssistantAllowUnlocked <$> Annex.getGitConfig)
                        ( Just <$> addUnlockedMatcher
                        , return Nothing
                        )

diff --git a/CHANGELOG b/CHANGELOG
index 21888c75f18ab964a88e19c4f76df327554d4415..327fbbed7bf66b49094a4f072baa4b4e62882a0a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@ git-annex (10.20250930) UNRELEASED; urgency=medium
 
   * Support ssh remotes with '#' and '?' in the path to the repository,
     the same way git does.
+  * assistant: Fix reversion that caused files to be added locked by
+    default.
 
  -- Joey Hess <id@joeyh.name>  Mon, 20 Oct 2025 15:22:30 -0400